searchbar: Fix clearing search entry on hide
authorFlorian Müllner <fmuellner@gnome.org>
Thu, 12 Nov 2020 18:04:42 +0000 (19:04 +0100)
committerFlorian Müllner <fmuellner@gnome.org>
Thu, 12 Nov 2020 18:59:55 +0000 (19:59 +0100)
Commit fa3d1940bf2b36 added separate grab handling for GtkSearchEntry, but
didn't consider whether the bar was revealed or concealed. The expected
behavior for the latter is that the entry is cleared rather than focused,
fix the condition accordingly.

gtk/gtksearchbar.c

index 42fdeb289416a401ae3f14c7e833ebbfb5cfa390..d7590bb7072a781cfa0c845c1561db4746a38613 100644 (file)
@@ -171,7 +171,7 @@ reveal_child_changed_cb (GObject      *object,
     {
       if (reveal_child && GTK_IS_ENTRY (bar->entry))
         gtk_entry_grab_focus_without_selecting (GTK_ENTRY (bar->entry));
-      else if (GTK_IS_SEARCH_ENTRY (bar->entry))
+      else if (reveal_child && GTK_IS_SEARCH_ENTRY (bar->entry))
         gtk_widget_grab_focus (bar->entry);
       else
         gtk_editable_set_text (GTK_EDITABLE (bar->entry), "");